Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Sep 2011 00:42:30 +0000 (17:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Sep 2011 00:42:30 +0000 (17:42 -0700)
commit19fe97ff28e4d08e3d4f88162de519baddda1198
treeb636245fa9a86f45531bfdbd47cc1f3e69461082
parent08da34321c8c1692e01c625c8e1f7b0e8e80013e
parent2315ec504234a168b8f33f8577a5b4443481dc88
Merge from trunk.